Register the size-changed signal correctly. (#323848, Murray Cumming)

2005-12-12  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkstatusicon.c (gtk_status_icon_class_init): Register
	the size-changed signal correctly.  (#323848, Murray Cumming)

diff --git a/ChangeLog b/ChangeLog
index cabd1f8502622a498a5cd28e7ded8301b3738382..d4ff58b99a5bc30d586d2e22382ce1f6d1b3b6ba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-12-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkstatusicon.c (gtk_status_icon_class_init): Register
+       the size-changed signal correctly.  (#323848, Murray Cumming)
+
+       * gtk/gtkmarshalers.list: Add necessary marshaller.
+
        * gtk/gtktextview.c (gtk_text_view_get_border_window_size): Don't
        fall thru to the wrong window types.  (#323843)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index cabd1f8502622a498a5cd28e7ded8301b3738382..d4ff58b99a5bc30d586d2e22382ce1f6d1b3b6ba 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,10 @@
 2005-12-12  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkstatusicon.c (gtk_status_icon_class_init): Register
+       the size-changed signal correctly.  (#323848, Murray Cumming)
+
+       * gtk/gtkmarshalers.list: Add necessary marshaller.
+
        * gtk/gtktextview.c (gtk_text_view_get_border_window_size): Don't
        fall thru to the wrong window types.  (#323843)
 

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index c18388f8e083ec84a06e52b760230458845aaee2..9d948c7c49f23c803ab578554cb75c91071ecf9d 100644 (file)
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -32,6 +32,7 @@ BOOLEAN:OBJECT,STRING,STRING,BOXED
 BOOLEAN:OBJECT,BOXED
 BOOLEAN:OBJECT,BOXED,BOXED
 BOOLEAN:OBJECT,STRING,STRING
+BOOLEAN:INT
 BOOLEAN:INT,INT
 BOOLEAN:INT,INT,INT
 BOOLEAN:UINT

diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
index 1ddb45adc3b242671817e7f2653d1d629fe26c2f..07fe5ba5ea05bd611479f57321b4411815c04e56 100755 (executable)
--- a/gtk/gtkstatusicon.c
+++ b/gtk/gtkstatusicon.c
@@ -275,7 +275,7 @@ gtk_status_icon_class_init (GtkStatusIconClass *class)
                  G_STRUCT_OFFSET (GtkStatusIconClass, size_changed),
                  NULL,
                  NULL,
-                 g_cclosure_marshal_VOID__INT,
+                 g_cclosure_marshal_BOOLEAN__INT,
                  G_TYPE_NONE,
                  1,
                  G_TYPE_INT);